Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

esp32: erase fabric information during factoryreset #13861

Merged
merged 1 commit into from
Jan 24, 2022
Merged

esp32: erase fabric information during factoryreset #13861

merged 1 commit into from
Jan 24, 2022

Conversation

chshu
Copy link
Contributor

@chshu chshu commented Jan 24, 2022

Problem

#13720

The fabric info was not erased during factoryreset in ESP platform. After #13181, the device only checks the fabric info and considers itself already commissioned even after factoryreset.

Change overview

Erase fabric information during factoryreset

Testing

Verified on m5stack.

@github-actions
Copy link

github-actions bot commented Jan 24, 2022 •
edited
Loading

PR #13861: Size comparison from 5227f3e to ba58daf

Increases (2 builds for esp32)
platform target config section 5227f3e ba58daf change % change
esp32 all-clusters-app c3devkit (read only) 918984 919076 92 0.0
(read/write) 1383434 1383466 32 0.0
.flash.rodata 179344 179376 32 0.0
.flash.text 918984 919076 92 0.0
m5stack (read only) 967431 967519 88 0.0
(read/write) 449852 449884 32 0.0
.flash.rodata 208508 208540 32 0.0
.flash.text 962047 962135 88 0.0
Full report (33 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 5227f3e ba58daf change % change
cyw30739 light cyw930739m2evb_01 (read/write) 574390 574390 0 0.0
.app_xip_area 479404 479404 0 0.0
.bss 77724 77724 0 0.0
.data 604 604 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
efr32 lighting-app BRD4161A (read only) 835916 835916 0 0.0
(read/write) 127244 127244 0 0.0
.bss 125344 125344 0 0.0
.data 1900 1900 0 0.0
.text 835908 835908 0 0.0
BRD4161A+rpc (read only) 823336 823336 0 0.0
(read/write) 143904 143904 0 0.0
.bss 141904 141904 0 0.0
.data 2000 2000 0 0.0
.text 823328 823328 0 0.0
window-app BRD4161A (read only) 806476 806476 0 0.0
(read/write) 125812 125812 0 0.0
.bss 123960 123960 0 0.0
.data 1852 1852 0 0.0
.text 806468 806468 0 0.0
esp32 all-clusters-app c3devkit (read only) 918984 919076 92 0.0
(read/write) 1383434 1383466 32 0.0
.dram0.bss 70720 70720 0 0.0
.dram0.data 14252 14252 0 0.0
.flash.rodata 179344 179376 32 0.0
.flash.text 918984 919076 92 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 967431 967519 88 0.0
(read/write) 449852 449884 32 0.0
.dram0.bss 75184 75184 0 0.0
.dram0.data 34032 34032 0 0.0
.flash.rodata 208508 208540 32 0.0
.flash.text 962047 962135 88 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 660588 660588 0 0.0
.bss 76608 76608 0 0.0
.data 1868 1868 0 0.0
.text 576312 576312 0 0.0
lock k32w061+release (read/write) 661312 661312 0 0.0
.bss 76848 76848 0 0.0
.data 1888 1888 0 0.0
.text 576776 576776 0 0.0
linux chip-tool-ipv6only arm64 (read only) 8536964 8536964 0 0.0
(read/write) 391009 391009 0 0.0
.bss 56049 56049 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 261032 261032 0 0.0
.dynamic 560 560 0 0.0
.got 69056 69056 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 436908 436908 0 0.0
.text 7261028 7261028 0 0.0
thermostat-no-ble arm64 (read only) 2051916 2051916 0 0.0
(read/write) 145697 145697 0 0.0
.bss 64785 64785 0 0.0
.data 904 904 0 0.0
.data.rel.ro 72984 72984 0 0.0
.dynamic 560 560 0 0.0
.got 4064 4064 0 0.0
.init 24 24 0 0.0
.init_array 320 320 0 0.0
.rodata 130700 130700 0 0.0
.text 1706720 1706720 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2352184 2352184 0 0.0
.bss 189428 189428 0 0.0
.data 5304 5304 0 0.0
.text 1314760 1314760 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2334408 2334408 0 0.0
.bss 180960 180960 0 0.0
.data 5584 5584 0 0.0
.text 1297008 1297008 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2304760 2304760 0 0.0
.bss 179960 179960 0 0.0
.data 5560 5560 0 0.0
.text 1267360 1267360 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2054256 2054256 0 0.0
.bss 156876 156876 0 0.0
.data 4864 4864 0 0.0
.text 1016856 1016856 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 942879 942879 0 0.0
bss 119044 119044 0 0.0
rodata 108916 108916 0 0.0
text 637312 637312 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 928347 928347 0 0.0
bss 116088 116088 0 0.0
rodata 101368 101368 0 0.0
text 632708 632708 0 0.0
nrf52840dongle_nrf52840 (read/write) 993527 993527 0 0.0
bss 121884 121884 0 0.0
rodata 113672 113672 0 0.0
text 669512 669512 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 852706 852706 0 0.0
bss 115828 115828 0 0.0
rodata 102092 102092 0 0.0
text 554232 554232 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 912223 912223 0 0.0
bss 118196 118196 0 0.0
rodata 103884 103884 0 0.0
text 612756 612756 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 822294 822294 0 0.0
bss 115016 115016 0 0.0
rodata 97112 97112 0 0.0
text 529712 529712 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 541835 541835 0 0.0
bss 52588 52588 0 0.0
rodata 50104 50104 0 0.0
text 376940 376940 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 915083 915083 0 0.0
bss 117960 117960 0 0.0
rodata 104248 104248 0 0.0
text 615404 615404 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 910267 910267 0 0.0
bss 117984 117984 0 0.0
rodata 103400 103400 0 0.0
text 611428 611428 0 0.0
shell nrf52840dk_nrf52840 (read/write) 798527 798527 0 0.0
bss 109776 109776 0 0.0
rodata 78324 78324 0 0.0
text 533928 533928 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 711342 711342 0 0.0
bss 107664 107664 0 0.0
rodata 72624 72624 0 0.0
text 451608 451608 0 0.0
p6 all-clusters-app default (read/write) 2410664 2410664 0 0.0
.bss 117772 117772 0 0.0
.data 2584 2584 0 0.0
.text 1368928 1368928 0 0.0
light-app default (read/write) 2330736 2330736 0 0.0
.bss 105544 105544 0 0.0
.data 2408 2408 0 0.0
.text 1289000 1289000 0 0.0
lock-app default (read/write) 2299752 2299752 0 0.0
.bss 104392 104392 0 0.0
.data 2360 2360 0 0.0
.text 1258016 1258016 0 0.0
qpg lighting-app qpg6105+debug (read only) 567476 567476 0 0.0
(read/write) 146940 146940 0 0.0
.bss 89688 89688 0 0.0
.data 1064 1064 0 0.0
.text 562156 562156 0 0.0
lock-app qpg6105+debug (read only) 515904 515904 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88256 88256 0 0.0
.data 988 988 0 0.0
.text 510584 510584 0 0.0
persistent-storage-app qpg6105+debug (read only) 107140 107140 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38504 38504 0 0.0
.data 288 288 0 0.0
.text 101820 101820 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 841718 841718 0 0.0
bss 87492 87492 0 0.0
noinit 37160 37160 0 0.0
text 588346 588346 0 0.0

@andy31415
Copy link
Contributor

fast track: platform specific change

@andy31415 andy31415 merged commit 1b49aee into project-chip:master Jan 24, 2022
selissia pushed a commit to selissia/connectedhomeip that referenced this pull request Jan 28, 2022
@chshu @selissia
esp32: erase fabric information during factoryreset (project-chip#13861)
589ea5f
rgoliver pushed a commit to rgoliver/connectedhomeip that referenced this pull request Mar 1, 2022
@chshu
esp32: erase fabric information during factoryreset (project-chip#13861)
da8a351
@rgoliver rgoliver mentioned this pull request Mar 1, 2022
Merged
andy31415 pushed a commit that referenced this pull request Mar 2, 2022
@chshu
Cherry pick RPC and factory reset code (#15692)
59e172a 
* RPC: Cleanup and add thread service (#14843)

* RPC: Refactor wifi RPC as common service

- Move WiFi into a common rpc service like others.
- Add WiFi RPC service to the all-clusters app

* RPC: Add thread rpc service to efr and nrf

- Add a Thread RPC service similar to others.
- Add to NRF and EFR32 platforms
- Add to efr/lighting RPC example app
- Add to efr/lock RPC example app
- Add to nfr/lighting RPC example app

* RPC: Add get/set pairing state

* RPC: Add OTCLI to EFR32 and NRF32

- Add the openthread cli as a new RPC service.
- Add service to EFR32 and NRF32 platforms
- Add to lighting/efr32 example
- Add to lighting/nrf example

* RPC: Refactor linux RPC into platform.

Move common linux Rpc.* files into common platform to match refactoring
done for other platforms.

* RPC: Wake m5 display on RPC button press

* RPC: Add descriptor cluster and QR code (#15217)

* RPC: Add Descriptor RPC Service

Add an RPC service for reading the descriptor cluster, this can
be used by test harnesses to identify the device types and
automatically select the correct tests to run.

* RPC: Add QR Code to device service

Add the QR code and QR code URL to the device RPC service.

* esp32: erase fabric information during factoryreset (#13861)

Co-authored-by: Shu Chen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andy31415 andy31415 andy31415 approved these changes

Assignees
No one assigned
Labels
esp32 fast track platform
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@chshu @andy31415